Merge branch 'master' into toolpalette

diff --cc demos/gtk-demo/Makefile.am
Simple merge

diff --cc docs/reference/gtk/Makefile.am
Simple merge

diff --cc docs/reference/gtk/gtk-docs.sgml
Simple merge

diff --cc docs/reference/gtk/gtk-sections.txt
Simple merge

diff --cc docs/reference/gtk/gtk.types
Simple merge

diff --cc docs/reference/gtk/visual_index.xml
Simple merge

diff --cc gtk/Makefile.am
Simple merge

diff --cc gtk/gtk.h
Simple merge

diff --cc gtk/gtk.symbols
Simple merge

diff --cc gtk/gtksettings.c
Simple merge

diff --cc gtk/gtktoolbutton.c
Simple merge

diff --cc gtk/gtktoolitem.c
Simple merge

diff --cc gtk/gtktoolshell.c
Simple merge